bitkeeper revision 1.1159.1.507 (41d2c267giyCo6LZ_--l9fFOwkMRIQ)

manual merge

diff --cc .rootkeys
Simple merge

diff --cc xen/Makefile
Simple merge

diff --cc xen/arch/x86/domain.c
index ce4ca8fda90b66d0f153677b2bd9a40e2f6d9fda,d0cf493522ef8e1227c094ed5524bf18371931f5..fc243373295f56abd2eba7e972ef39d863998f1c
--- 1/xen/arch/x86/domain.c
--- 2/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@@ -32,12 -33,12 +33,16 @@@
  #include <asm/shadow.h>
  #include <xen/console.h>
  #include <xen/elf.h>
 +#include <asm/vmx.h>
 +#include <asm/vmx_vmcs.h>
 +#include <xen/kernel.h>
 +#include <public/io/ioreq.h>
  #include <xen/multicall.h>
  
+ /* opt_noreboot: If true, machine will need manual reset on error. */
+ static int opt_noreboot = 0;
+ boolean_param("noreboot", opt_noreboot);
+ 
  #if !defined(CONFIG_X86_64BITMODE)
  /* No ring-3 access in initial page tables. */
  #define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED)

diff --cc xen/arch/x86/io_apic.c
Simple merge

diff --cc xen/arch/x86/setup.c
Simple merge

diff --cc xen/arch/x86/traps.c
Simple merge

diff --cc xen/arch/x86/x86_32/entry.S
Simple merge

diff --cc xen/common/kernel.c
Simple merge

diff --cc xen/common/page_alloc.c
Simple merge

diff --cc xen/common/physdev.c
Simple merge

diff --cc xen/common/schedule.c
index 94af2ee176f13ac894dbd454aea52a4bd509b883,8639e51465ad0dba6e06b21561be2c0850af5b43..35ae9468a18d9ba1c50ff80c1e717cfc6df6553a
--- 1/xen/common/schedule.c
--- 2/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@@ -541,10 -483,8 +545,8 @@@ void __init scheduler_init(void
          t_timer[i].function = &t_timer_fn;
      }
  
 -    schedule_data[0].idle = &idle0_task;
 +    schedule_data[0].idle = &idle0_exec_domain;
  
-     extern char opt_sched[];
- 
      for ( i = 0; schedulers[i] != NULL; i++ )
      {
          ops = *schedulers[i];

diff --cc xen/drivers/char/console.c
Simple merge